From ea6660721bf420bb7656cd6c0d8aa04230ccc41e Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 22 Jun 2017 21:10:41 +0200
Subject: NetworkSingleton: Fixed a throw warning in VS2017. (#3792)

Also fixed the misleading name.
---
 src/Bindings/LuaState.h            | 6 +++---
 src/Globals.h                      | 6 +++---
 src/OSSupport/NetworkSingleton.cpp | 2 +-
 src/OSSupport/NetworkSingleton.h   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index 44d4c6448..4320ce40e 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -77,7 +77,7 @@ public:
 				}
 			}
 
-			~cStackBalanceCheck() NO_THROW
+			~cStackBalanceCheck() CAN_THROW
 			{
 				auto currStackPos = lua_gettop(m_LuaState);
 				if (currStackPos != m_StackPos)
@@ -117,7 +117,7 @@ public:
 		{
 		}
 
-		~cStackBalancePopper() NO_THROW
+		~cStackBalancePopper() CAN_THROW
 		{
 			auto curTop = lua_gettop(m_LuaState);
 			if (curTop > m_Count)
@@ -476,7 +476,7 @@ public:
 			std::swap(m_StackLen, a_Src.m_StackLen);
 		}
 
-		~cStackValue() NO_THROW
+		~cStackValue() CAN_THROW
 		{
 			if (m_LuaState != nullptr)
 			{
diff --git a/src/Globals.h b/src/Globals.h
index f7116f8e0..777f8ca3d 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -52,9 +52,9 @@
 	#define NORETURN __declspec(noreturn)
 	#if (_MSC_VER < 1910)
 		// MSVC 2013 (and possibly 2015?) have no idea about "noexcept(false)"
-		#define NO_THROW throw(...)
+		#define CAN_THROW throw(...)
 	#else
-		#define NO_THROW noexcept(false)
+		#define CAN_THROW noexcept(false)
 	#endif
 
 	// Use non-standard defines in <cmath>
@@ -118,7 +118,7 @@
 	#endif
 
 	#define NORETURN __attribute((__noreturn__))
-	#define NO_THROW noexcept(false)
+	#define CAN_THROW noexcept(false)
 
 #else
 
diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp
index 7daf85b76..af3a701a8 100644
--- a/src/OSSupport/NetworkSingleton.cpp
+++ b/src/OSSupport/NetworkSingleton.cpp
@@ -23,7 +23,7 @@ cNetworkSingleton::cNetworkSingleton() :
 
 
 
-cNetworkSingleton::~cNetworkSingleton()
+cNetworkSingleton::~cNetworkSingleton() CAN_THROW
 {
 	// Check that Terminate has been called already:
 	ASSERT(m_HasTerminated);
diff --git a/src/OSSupport/NetworkSingleton.h b/src/OSSupport/NetworkSingleton.h
index 0b815af43..59ec713c4 100644
--- a/src/OSSupport/NetworkSingleton.h
+++ b/src/OSSupport/NetworkSingleton.h
@@ -41,7 +41,7 @@ class cNetworkSingleton
 {
 public:
 	cNetworkSingleton();
-	~cNetworkSingleton();
+	~cNetworkSingleton() CAN_THROW;
 
 	/** Returns the singleton instance of this class */
 	static cNetworkSingleton & Get(void);
-- 
cgit v1.2.3